[Explicit Module Builds] Emit a JSON file that specifies details of explicit Swift module dependencies by artemcm · Pull Request #133 · swiftlang/swift-driver

artemcm · 2020-06-19T23:31:24Z

This PR implements the interface expected by the frontend, as built by @nkcsgexi in:
swiftlang/swift#32355
swiftlang/swift#32450

Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with -explicit-swift-module-map-file. The key benefit is that now the frontend doesn't need to deserialize the .swiftmodule file just to collect the module's name.

Resolves rdar://problem/64533451

artemcm · 2020-06-19T23:31:54Z

@swift-ci please test

Sources/SwiftDriver/Explicit Module Builds/ExplicitModuleBuildHandler.swift

nkcsgexi

Thank you for adopting this so fast!

Sources/SwiftDriver/Explicit Module Builds/ExplicitModuleBuildHandler.swift

nkcsgexi · 2020-06-22T22:10:40Z

Sources/SwiftDriver/Explicit Module Builds/SwiftModuleArtifacts.swift

+    self.sourceInfoPath = sourceInfoPath
+  }
+
+  private enum CodingKeys : String, CodingKey {


We shouldn't need the CodingKeys if we use these keys as the field names.

I mostly just wanted to stick to the Swift naming convention (Types start with an uppercase letter, variables start with a lowercase latter), but I don't have a strong preference.

That's fair. How about we change the compiler-side to use keys conforming to the Swift naming convention and remove CodingKeys?

Yeah, that'd be great!

Here is the change: swiftlang/swift#32507

@nkcsgexi , I've addressed the comments, but the change now has to wait for swiftlang/swift#32507 to be picked up by the next master snapshot toolchain.

artemcm · 2020-06-22T23:29:19Z

@swift-ci please test

nkcsgexi

Thank you, @artemcm !

DougGregor · 2020-06-27T04:23:07Z

@swift-ci test

Sources/SwiftDriver/Explicit Module Builds/ExplicitModuleBuildHandler.swift

artemcm · 2020-06-28T01:44:03Z

We haven't had a new snapshot toolchain on swift.org for a few days now, and this change has a dependency on one of Xi's changes that was made after the most recent one one was created. So this will need to wait a little bit until it can be tested in the CI.

artemcm · 2020-06-29T22:10:57Z

@swift-ci please test

artemcm · 2020-06-30T13:16:13Z

@swift-ci please test

artemcm · 2020-06-30T15:51:09Z

@swift-ci test

artemcm · 2020-07-01T17:01:39Z

@swift-ci please test

…xplicit Swift module dependencies This PR implements the interface expected by the frontend, as built in: swiftlang/swift#32355 swiftlang/swift#32450 Swift module's explicit Swift module dependencies are now encoded in a JSON file, passed with `-explicit-swift-module-map-file` Resolves rdar://problem/64533451

…/input gathering to match swift

artemcm · 2020-07-01T18:17:52Z

@swift-ci please test

artemcm · 2020-07-01T18:18:24Z

@swift-ci please test

artemcm requested review from DougGregor and nkcsgexi June 19, 2020 23:31

cltnschlosser reviewed Jun 20, 2020

View reviewed changes

artemcm force-pushed the JSONSwiftDependencies branch from f4eb16b to d9a63cc Compare June 22, 2020 16:30

nkcsgexi reviewed Jun 22, 2020

View reviewed changes

artemcm force-pushed the JSONSwiftDependencies branch 2 times, most recently from 2b83afd to d0a0da6 Compare June 22, 2020 23:27

artemcm force-pushed the JSONSwiftDependencies branch 3 times, most recently from c4b99b8 to ade77cd Compare June 23, 2020 23:42

nkcsgexi approved these changes Jun 24, 2020

View reviewed changes

artemcm force-pushed the JSONSwiftDependencies branch 2 times, most recently from c8b256a to defa4fc Compare June 25, 2020 21:04

DougGregor approved these changes Jun 27, 2020

View reviewed changes

Sources/SwiftDriver/Explicit Module Builds/ExplicitModuleBuildHandler.swift Outdated Show resolved Hide resolved

Sources/SwiftDriver/Explicit Module Builds/ExplicitModuleBuildHandler.swift Show resolved Hide resolved

artemcm force-pushed the JSONSwiftDependencies branch from defa4fc to 5cb5a9c Compare June 28, 2020 01:41

artemcm force-pushed the JSONSwiftDependencies branch from 5cb5a9c to b817ead Compare June 29, 2020 22:06

artemcm added 2 commits July 1, 2020 11:17

[Explicit Module Builds] Refactor clang module dependency commandLine…

33480f2

…/input gathering to match swift

artemcm force-pushed the JSONSwiftDependencies branch from b817ead to 33480f2 Compare July 1, 2020 18:17

artemcm merged commit 9384f94 into swiftlang:master Jul 1, 2020

artemcm deleted the JSONSwiftDependencies branch January 20, 2021 19:00

Conversation

artemcm commented Jun 19, 2020

Uh oh!

artemcm commented Jun 19, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nkcsgexi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nkcsgexi Jun 22, 2020

Choose a reason for hiding this comment

Uh oh!

artemcm Jun 22, 2020

Choose a reason for hiding this comment

Uh oh!

nkcsgexi Jun 22, 2020

Choose a reason for hiding this comment

Uh oh!

artemcm Jun 23, 2020

Choose a reason for hiding this comment

Uh oh!

nkcsgexi Jun 23, 2020

Choose a reason for hiding this comment

Uh oh!

artemcm Jun 23, 2020

Choose a reason for hiding this comment

Uh oh!

artemcm commented Jun 22, 2020

Uh oh!

nkcsgexi left a comment

Choose a reason for hiding this comment

Uh oh!

DougGregor commented Jun 27, 2020

Uh oh!

Uh oh!

Uh oh!

artemcm commented Jun 28, 2020

Uh oh!

artemcm commented Jun 29, 2020

Uh oh!

artemcm commented Jun 30, 2020

Uh oh!

artemcm commented Jun 30, 2020

Uh oh!

artemcm commented Jul 1, 2020

Uh oh!

artemcm commented Jul 1, 2020

Uh oh!

artemcm commented Jul 1, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants